Autogenerated HTML docs for v1.7.5-rc0-96-gc4b2c
diff --git a/git-config.html b/git-config.html index 1128e14..0c4f331 100644 --- a/git-config.html +++ b/git-config.html
@@ -2639,6 +2639,22 @@ access method.</p></div> <div class="dlist"><dl> <dt class="hdlist1"> +grep.lineNumber +</dt> +<dd> +<p> + If set to true, enable <em>-n</em> option by default. +</p> +</dd> +<dt class="hdlist1"> +grep.extendedRegexp +</dt> +<dd> +<p> + If set to true, enable <em>--extended-regexp</em> option by default. +</p> +</dd> +<dt class="hdlist1"> gui.commitmsgwidth </dt> <dd> @@ -3208,6 +3224,21 @@ </p> </dd> <dt class="hdlist1"> +merge.defaultToUpstream +</dt> +<dd> +<p> + If merge is called without any commit argument, merge the upstream + branches configured for the current branch by using their last + observed values stored in their remote tracking branches. + The values of the <tt>branch.<current branch>.merge</tt> that name the + branches at the remote named by <tt>branch.<current branch>.remote</tt> + are consulted, and then they are mapped via <tt>remote.<remote>.fetch</tt> + to their corresponding remote tracking branches, and the tips of + these tracking branches are merged. +</p> +</dd> +<dt class="hdlist1"> merge.log </dt> <dd>
